Repository navigation
Hyperviolence: the rest of the merged split PRs into master - #584
Merged
Merged
Conversation
…or and Shiptest guns
…e and ability animations - Street and milspec models of Cascade, Redline, Ghostskin and Governor Delete, with the Shiv and Scorch Blades, the Widowline Arc and Brawler myomers. - Ratchet's Back Bay, a street ripperdoc at Quartermain Depot. Both ripperdocs buy back pulled street chrome and burnt-out NPC chrome. - New chrome: leg, hand, plating, lung, lining, reflex and ear pieces, the holdout revolver arm, and street passives. - Ghostskin and better hide the wearer from turrets, older mobs and human NPCs short of bosses. - Ability animations for Redline, Cascade, Ghostskin, the Lazarus node, leaps, EMP and brownouts, and the Chrome Cradle's rig. Worn chrome draws over the jumpsuit. - Reflex windows dodge blows and ranged fire by model and crit more often. - The Chrome Cradle fits a second arm housing of the same kind on the free arm. - Chrome stock in the loot themes and at Splice, gear ratings, the admin chrome test kit, and the wiki. - The cyberdeck's leftovers are removed from Machine Communion.
A chrome read draws on the reader's screen instead of printing to chat: corner brackets lock on over a pulsing outline, then a panel with the subject's name, a socket per piece of hardware framed by grade, a short name list and a load bar. Street optics show static and no names, and a Ghostskin subject breaks the lock. Bystanders see the reader's eyes flicker and the subject sees their own body flinch red. Brings back the readout test and the NPC read that the cyberware lines left out.
- The chrome wheel (V): a radial of every ability the bearer's chrome carries, one arc per body region, with cooldown, offline and deployed states on each chip. - Use chrome (Shift+V), Use OS chrome (Ctrl+V) and Arm chrome (Alt+V), all rebindable. - One Chrome button shows the pick and opens the wheel; chrome abilities no longer get a button each. - Optics zoom on every chrome optic, from the wheel, further on better optics; no shooting while zoomed. - Five new optics: Spyglass, Assay optics, Longsight, Marksman link and Lookout, with shop stock, loot placement and gear ratings. - The cyberware matrix test and the opt-in soak test.
The prison wing's NPCs are now human NPCs (/mob/living/carbon/human/npc): real human bodies with tg's own crit, wounds, cuffs, medicine and death. - Inmates, the guards and their routine, and Kessler's visiting agents and researcher. A guard who is beaten down beams out and comes back. - Experiment subjects turn on their own body: the hulk, the nightmare and the fly person bleed, go into crit and can be cuffed, drugged and revived. Kessler's team darts a living one and takes it away. - Guards get out of the line of stun fire and go back to their routine. - A prisoner who breaks out walks the outpost's patrol path as a person and fights with their fists. - The basic-mob prisoner and guard types are removed, with the bounty cuff and damage multipliers they carried.
…people The ambient NPCs are now human NPCs (/mob/living/carbon/human/npc): real human bodies with tg's own crit, wounds, cuffs, medicine and death. This finishes the move of human-looking NPCs onto the human NPC body. - Outpost patrons, regulars, workers, the angler and the dancer; planet fishers, miners, peddlers, jungle and site NPCs; faction recruiters; stranded strays and recruits; and the survivor of a rescue mission. - A townsperson keeps one face whether idle, working or dead. A body at a trader outpost is taken away five minutes after death once nobody is near it. - Traders and checkpoint guards stay invulnerable fixtures, and say so in their files. - Zone health scaling refuses carbons: a person keeps tg's health in every zone. - The basic-mob ambient NPC types are removed. - The cross-family tests land here: zone profiles, garbage collection of every family, and combat sense.
…very NPC conversion Merge of split/chrome-wheel-zoom and split/npc-ambient. No content of its own.
… tests The Ghostskin weave already hides its bearer from human NPCs, hostile animals and turrets. The experiment forms of a prison wing now lose a camouflaged target beyond the same spotting range. Adds the two cyberware tests that need both the chrome and the converted NPCs: optical camo against pirates, mobsters, turrets and experiment forms, and the final pass (an armed ability's click, Ghostskin dropping on a hit, the wheel's zoom entry, the full trade-in shelf, pirate bosses seeing through camo). Brings the shop catalog and zone shop tests up to the cyberware catalog: the new ripperdoc stock has its zone permissions listed, and only the Holdout housing may be sold as a gun arm.
… garrote - The Widowline is a thin laser wire that lashes out of the hand, with its own deploy and retract sounds. - An aimed cut at a hurt arm or leg severs it cleanly, and losing a leg puts the victim down. Two wires make a crossing cut. - A cut carries on into the one person standing right behind the target for 75% of the damage and never takes a limb off them. It replaces the cleave around the target. - Someone helpless on the floor can be garroted: the throat, or the head in hard crit. The Widowline Arc always takes the head. An Atlas frame, a sealed helmet or an armoured collar stop it. - The Widowline Arc's shock is a small crackle where the wire touched. - Wire-cut stump overlays, and the Widowline unit tests.
… door pry - The puppet rig that draws a body's arms as their own pieces, and the arm swings built on it. - The piston punch drives the fist onto the part it hits and goes through the gore layer: repeated hits on one limb snap the bone, and a body knocked into a wall is hurt by it and marks it. - Knockbacks and hurls stop on the last safe tile. - A charged haymaker, a ground pound for the synced pair, and a deploy flex. - Punches dent airlocks and the pair pries doors; a trader outpost's doors refuse both and count the attempt. - Brawler myomers sync as their own pair: a slow pry and a light ground pound, no hurl or haymaker. 2,000 cr the pair. - Gear ratings for both pairs, and the Gorilla unit tests for these moves.
- Someone held in an aggressive grab is lifted and brought down on the floor under them, an open floor beside the bearer or a table, with a click there. - The slam is called off when the body leaves the hold. - Brawler myomers slam lighter and on a longer clock. - The slam's unit tests, and the Brawler line of the wiki.
- A punch at someone in crit or stunned starts a finisher picked by the aimed zone, only square on. - Armour on the part and the Atlas frame turn each one into a lesser hurt. - A crate or a table ahead blocks the backbreaker. - The synced Brawler pair has the limb rip. - The chrome finisher base the other chrome finishers share, and the finisher unit tests.
Outpost traders pay for what a crew sells by how rare it is, and the best goods earn trade vouchers. Wherever a trader paid one flat price for any of something, rare goods have their own, higher price: Dram's mixed drinks, Sawbones' organs, Splice's and the street doc's found chrome, Sarge's weapons and armor, Boffin's extracts and anomaly cores, Wick's MODsuits and modules, Fern's prize crops, Pike's trophy fish and Roux's specialty dishes. Each trader takes only a few of each voucher item a round, shared by every crew, and voucher items do not restock with the convoy. Traders won't buy back anything bought from a trader or ordered from cargo, a ship's starting gear sells only at the salvage price, and printed organs, spent extracts and worn suits aren't accepted.
Merge of split/npc-ambient and split/mission-waves. No content of its own.
…ling lunge, the X-slash and the scissor - The blades are drawn as their own pieces: an ordinary hit swings the blade, and only the blade that cut carries blood. - Three quick cuts to one limb open its artery. - Holding the lunge crouches for a longer leap; a kill brings the lunge back. - A two-blade lunge onto someone already hurt impales them, pinned to a wall if one is behind them. - Every third cut with both blades out is an X-slash that staggers. - A scissor finisher on someone helpless, only square on. - Shiv Blades get none of these moves; Scorch Blades light what they cut and half-seal the arteries they open. - Someone a lunge lands on falls over instead of dropping flat. - The Mantis unit tests, wiki rows and gear rating notes.
- Big Game Hunt: staking the lure leaves an anchored rig that thumps; the beast and its pack appear out of sight and charge it. A fresh lure is sent if the planet unloads mid-hunt. - Rescue survivors hide in a locker or a sheltered corner, call for help on the contract ship's radio, react to rescuers and hostiles, and leave in a transporter beam. - Mission objectives never spawn where a player can see them, and planet spawns and wave arrivals skip lava, water and chasms. The mission pad flashes for every kit it delivers and every item it takes in. - Field Expedition, recovery, extraction and survey sites are dressed so they can be found by eye. The dressing is scenery only. - Prospect Stake names a planet; the claim beacon deploys on open ground there and its clock runs only while a crew member is near it and awake. - Exploration contracts hold position for a 30-second sensor sweep that can chart a nearby derelict. - Hot Extraction cargo needs a wrench to unbolt, and the Drug Run replacement ingredient grows near the original cache.
The cradle's surgical rig stands on a low plinth and mast behind the slab, drawn under the slab and the patient, instead of floating above it. The carried implant's path is moved so the gripper sets it down on the patient's chest, and it fades in as it leaves the rig's head.
Dermal Mesh weave glances 15% of bullets, Hardweave plating 30% and Slabskin plate 45%. Only bullets and buckshot pellets that hit from the front, each pellet rolling on its own; lasers, energy, melee and shots into the back are never deflected. A glanced round turns off at a random angle and keeps flying at reduced damage, with sparks and a ricochet ping, and costs the wearer a little stamina. Deflect shares the cyberware dodge cap (dodge and deflect together never stop more than 60% of shots) and is off while the plating is EMP'd or browned out. Gear ratings and the cyberware wiki page are updated.
…ard kit Merge of split/npc-ambient and split/bounty-guards. No content of its own.
Normal criminals and their companions react to stun fire as pirates and prison guards do. Hit by a disabler or another stun shot, a criminal whose style shoots or throws from range runs for the nearest cover on its leash and looks out again a moment later; a fist, knife, bat or shotgun fighter charges the shooter. A Wanted criminal carries a stimpack and a Most Wanted one a combat stimpack, when the style leaves a pocket free, and jabs it when it tires in a fight. Petty criminals and companions carry none. Meek criminals, decoys and bosses have no combat sense.
…on, the bounty guard kit, combat sense and NPC friendly fire Merge of split/gore-mantis, split/bounty-combat-sense and split/npc-shield. No content of its own.
- Some criminals carry the cyberware players buy, installed in their real body, and fight with it: Cascade lattice, Mantis Blades, Gorilla Arms, Redline core, Meteor Piledriver, Lazarus and Deadeye. Higher tiers carry it more often; companions rarely and never more than one piece; meek criminals never. Every move has a visible wind-up, an EMP knocks a piece out, and NPC chrome never drops. - The cyberpsycho: a new Most Wanted mini-boss with Mantis on one arm, Gorilla on the other, the Piledriver, a Lazarus node and Deadeye optics, and Redline as its second phase. - Mini-bosses engage the whole hunting crew on the site, come through or break for cover when shot from somewhere they cannot reach, have their own answer to disablers each and carry a combat stimpack. In vacuum they seal up in locked MODsuits. The Pyromaniac carries a real flamethrower, a molotov, smoke grenades and a gas mask. - Companions back their criminal up, at most one per posting carries a gun, and the card says who the criminal was seen with. Bounty guns reach 7 tiles, and criminals, companions, mini-bosses, the kingpin's goons and Club Volga move at a person's pace in a fight. - Cyber optics read a criminal's chrome, and the criminal notices. The Bounty Panel can spawn a criminal with chosen chrome or a cyberpsycho. The wiki's bounty and pirate pages are updated.
It was a ripperdoc trade-in row, and those buy back shelf stock; no shelf sells burnt chrome. Splice and Ratchet both take it as scrap now.
The wire's slash is not in the icon sheet. Neither wire plays an impact or tg's flying spool on what it hits.
It belongs with the change that makes NPCs lose sight of camo, which has the test for it.
Chrome Read plays out over its subject on the reader's screen
Optical camo hides from the prison's experiment forms; late cyberware tests
Bounty criminals carry chrome; the cyberpsycho
Bounty criminals and companions get combat sense against stun weapons
Mount the chrome cradle's rig on a mast
Traders pay for rare goods
Dermal plating deflects bullets from the front
More immersive missions
- The chrome wheel (V): a radial of every ability the bearer's chrome carries, one arc per body region, with cooldown, offline and deployed states on each chip. - Use chrome (Shift+V), Use OS chrome (Ctrl+V) and Arm chrome (Alt+V), all rebindable. - One Chrome button shows the pick and opens the wheel; chrome abilities no longer get a button each. - Optics zoom on every chrome optic, from the wheel, further on better optics; no shooting while zoomed. - Five new optics: Spyglass, Assay optics, Longsight, Marksman link and Lookout, with shop stock, loot placement and gear ratings. - The cyberware matrix test and the opt-in soak test.
# Conflicts: # voidcrew/modules/unit_tests/_unit_tests.dm
Mantis Blades gore: swings, torn arteries, the charged leap, the impaling lunge, the X-slash and the scissor
# Conflicts: # voidcrew/modules/ambient_npcs/recruit.dm # voidcrew/modules/missions/missions/rescue.dm # voidcrew/modules/missions/objectives/site_ops.dm # voidcrew/modules/unit_tests/voidcrew_missions.dm
# Conflicts: # voidcrew/modules/unit_tests/_unit_tests.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The rest of the hyperviolence split into master. Every piece here was already reviewed and merged in its own PR, but into the stack's base branches, not into master. This brings those base branches in, merged with each other and with master:
split/base-cyberware: Cyberware lines: cheaper chrome models, a street ripperdoc, new chrome and ability animations #554 cyberware lines, Chrome Read plays out over its subject on the reader's screen #555 chrome read, Chrome wheel, Chrome button, chrome keybinds and optics zoom #556 chrome wheel zoom, Mount the chrome cradle's rig on a mast #573 cradle rig, Widowline gore: a laser wire with clean severs, a through-cut and the garrote #562 widowline, Gorilla Arms gore: the piston punch, haymaker, hurl, ground pound and door pry #563 Gorilla Arms, Gorilla Arms gore: the grab-slam #564 Gorilla slam, Gorilla Arms gore: the head clap, the limb rip and the backbreaker #565 Gorilla finishers, Mantis Blades gore: swings, torn arteries, the charged leap, the impaling lunge, the X-slash and the scissor #566 Mantis Blades, Dermal plating deflects bullets from the front #574 dermal deflectsplit/base-mission-immersion: More immersive missions #572 mission immersion (with Mission waves arrive by drop pod or dig out of the ground #567 mission waves)split/base-chrome-npcs: Optical camo hides from the prison's experiment forms; late cyberware tests #575 optical camo against NPCs, Traders pay for rare goods #576 trader buybackssplit/base-bounty-combat-sense: Bounty criminals and companions get combat sense against stun weapons #577 bounty combat sensesplit/base-bounty-chrome: Bounty criminals carry chrome; the cyberpsycho #578 bounty chrome and the cyberpsychoWith this in, master has everything #512 had when the split was made, plus #560's test fixes. Work merged into #512 after that (#536, Sandevistan) is not included. Each PR's description has its screenshots and details; nothing new is added here.